Autogenerated HTML docs for v1.7.11-3-g60475
diff --git a/git-merge.html b/git-merge.html index bd37876..316fc08 100644 --- a/git-merge.html +++ b/git-merge.html
@@ -710,7 +710,7 @@ <p> In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being - merged. See also . + merged. See also <a href="git-fmt-merge-msg.html">git-fmt-merge-msg(1)</a>. </p> <div class="paragraph"><p>With --no-log do not list one-line descriptions from the actual commits being merged.</p></div> @@ -888,7 +888,7 @@ <div class="sectionbody"> <div class="paragraph"><p>Before applying outside changes, you should get your own work in good shape and committed locally, so it will not be clobbered if -there are conflicts. See also . +there are conflicts. See also <a href="git-stash.html">git-stash(1)</a>. <em>git pull</em> and <em>git merge</em> will stop without doing anything when local uncommitted changes overlap with files that <em>git pull</em>/<em>git merge</em> may need to update.</p></div> @@ -1177,7 +1177,7 @@ to avoid mismerges that sometimes occur due to unimportant matching lines (e.g., braces from distinct functions). Use this when the branches to be merged have diverged wildly. - See also <tt>--patience</tt>. + See also <a href="git-diff.html">git-diff(1)</a> <tt>--patience</tt>. </p> </dd> <dt class="hdlist1"> @@ -1194,7 +1194,7 @@ Treats lines with the indicated type of whitespace change as unchanged for the sake of a three-way merge. Whitespace changes mixed with other changes to a line are not ignored. - See also <tt>-b</tt>, <tt>-w</tt>, and + See also <a href="git-diff.html">git-diff(1)</a> <tt>-b</tt>, <tt>-w</tt>, and <tt>--ignore-space-at-eol</tt>. </p> <div class="ulist"><ul> @@ -1227,7 +1227,7 @@ meant to be used when merging branches with different clean filters or end-of-line normalization rules. See "Merging branches with differing checkin/checkout attributes" in - for details. + <a href="gitattributes.html">gitattributes(5)</a> for details. </p> </dd> <dt class="hdlist1"> @@ -1245,7 +1245,7 @@ <dd> <p> Controls the similarity threshold used for rename detection. - See also <tt>-M</tt>. + See also <a href="git-diff.html">git-diff(1)</a> <tt>-M</tt>. </p> </dd> <dt class="hdlist1"> @@ -1380,7 +1380,7 @@ recorded in commits to a canonical form before performing a merge to reduce unnecessary conflicts. For more information, see section "Merging branches with differing checkin/checkout - attributes" in . + attributes" in <a href="gitattributes.html">gitattributes(5)</a>. </p> </dd> <dt class="hdlist1"> @@ -1398,7 +1398,7 @@ <dd> <p> Controls which merge resolution program is used by - . Valid built-in values are: "araxis", + <a href="git-mergetool.html">git-mergetool(1)</a>. Valid built-in values are: "araxis", "bc3", "diffuse", "ecmerge", "emerge", "gvimdiff", "kdiff3", "meld", "opendiff", "p4merge", "tkdiff", "tortoisemerge", "vimdiff" and "xxdiff". Any other value is treated is custom merge tool @@ -1424,7 +1424,7 @@ <dd> <p> Defines a human-readable name for a custom low-level - merge driver. See for details. + merge driver. See <a href="gitattributes.html">gitattributes(5)</a> for details. </p> </dd> <dt class="hdlist1"> @@ -1433,7 +1433,7 @@ <dd> <p> Defines the command that implements a custom low-level - merge driver. See for details. + merge driver. See <a href="gitattributes.html">gitattributes(5)</a> for details. </p> </dd> <dt class="hdlist1"> @@ -1443,7 +1443,7 @@ <p> Names a low-level merge driver to be used when performing an internal merge between common ancestors. - See for details. + See <a href="gitattributes.html">gitattributes(5)</a> for details. </p> </dd> <dt class="hdlist1"> @@ -1460,15 +1460,16 @@ </div> <h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<div class="paragraph"><p>, , -, -, -, , -, ,</p></div> +<div class="paragraph"><p><a href="git-fmt-merge-msg.html">git-fmt-merge-msg(1)</a>, <a href="git-pull.html">git-pull(1)</a>, +<a href="gitattributes.html">gitattributes(5)</a>, +<a href="git-reset.html">git-reset(1)</a>, +<a href="git-diff.html">git-diff(1)</a>, <a href="git-ls-files.html">git-ls-files(1)</a>, +<a href="git-add.html">git-add(1)</a>, <a href="git-rm.html">git-rm(1)</a>, +<a href="git-mergetool.html">git-mergetool(1)</a></p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="paragraph"><p>Part of the suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> </div> <div id="footnotes"><hr /></div>
